Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 1 Dec 2005 03:40:26 +0000 (03:40 +0000)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Thu, 1 Dec 2005 03:40:26 +0000 (03:40 +0000)

Trivial merge